Merge branch 'merge-pride01' into dv5_tweaks