Merge branch 'release/SP2' into develop
PBI 5 Complete
Merge branch 'release/SP3'