closes #1797 Change-Id: I8036cad421d996b09e95946094fd43a55324778e (cherry picked from commit 6bdedc54ae)
6bdedc54ae