closes #1883 Change-Id: Ic364b8d2bdd0f50438b121571d86660b88b2945e (cherry picked from commit 03ef7a737c)
03ef7a737c