closes #656 Change-Id: Ibc69f5f692c91ec73774fbe7fbd7d8602ca82928 (cherry picked from commit 99471b607c)
99471b607c