Bug 2181 p1
Merge branch 'Bug2181' into dev