Bug2181 v2
Merge branch 'Bug2181' into dev