closes #1404 Change-Id: I282db8287f31d49eb26f0baf01951187577d7890 (cherry picked from commit 835ba08b5f)
835ba08b5f