SP5 release bug fixes 1
SP5 release bug fixes 2
Merge branch 'release/SP5' into develop