Bug 2189
Zit 3110 p3
Merge branch 'Bug2189' into dev
Merge branch 'Zit3110-3' into dev