Bug 2176 v2
Merge branch 'Bug2176' into dev