Merge maintenance-work branch: