fixes #1688 Change-Id: If1a73381bae0d4f475237b65f0978c33e088cfb6 (cherry picked from commit b3c9278f84)
b3c9278f84