fixes for v52 / SOFTWARE-1444
Merge branch 'v52'

merge in the fixes from v52 / SOFTWARE-1444