closes #975 Change-Id: I21f7f10f99718ee88e688f0daf65011e8809df67 (cherry picked from commit e741a7434e)
e741a7434e