closes #1283 Change-Id: I640ff269643eb6ecf9d6fd2a21601aeb39acac58 (cherry picked from commit 017dbbd330)
017dbbd330