closes #1230 Change-Id: I26cae7b53eed1ff8155d2fa1e1aa5283a9c37d36 (cherry picked from commit e70d203802)
e70d203802