US632 - complete ui for 2.1/2.4
Remove reference to async flag
Merge branch 'development' into integration