Bug fix 1
Merge branch 'release/SP2' into develop