Merge commit 'd3f960b7f4401fae773bca8d93c3c72b9df1476b' * commit 'd3f960b7f4401fae773bca8d93c3c72b9df1476b': Fix issue 1846343 - part 1