closes #884 Change-Id: I70492beed191de9ae7167990ee275c0eecc9bd80 (cherry picked from commit 2b87948014)
2b87948014