Merge branch 'release/SP1' into develop
PBI 4 Complete
Bug fix 1
Merge branch 'release/SP2'