US507 Testcases 3,4 and 5
Merge remote-tracking branch 'origin/development' into development