Merge branch 'PM-696' into 4.2
PM-696
4.2 merge