Iteration B1 - add validation, and update existing controller test
Merge branch 'release/Iteration_B1' into develop