Regression from 8b50a41063 closes #1995 Change-Id: If68397af3863c30eb225f0f579cf45761c7a606e (cherry picked from commit 0b64fb3213) (cherry picked from commit 0ab4d906aa)
8b50a41063
0b64fb3213
0ab4d906aa