Removed redundant block
Merge branch 'dev' into ms