Change-Id: Idaa87f9147db5f7cede8643f368f386ab6913e9a
mentioned in issue #1926
mentioned in issue #1931