Merge branch 'maintenance-branch' into pre-merge