Merge changes from topic 'mri-neon-sr1' into stable/neon