closes #927 Change-Id: I0f53f31dce31990d999516173be4b483d90b4021 (cherry picked from commit 7ea6389c56)
7ea6389c56