Merge commit 'e64bb1dd9ed68281af9968cf2cd23b4e49ead76c' * commit 'e64bb1dd9ed68281af9968cf2cd23b4e49ead76c': Fix issue #1924851
Merge commit 'e64bb1dd9ed68281af9968cf2cd23b4e49ead76c' * commit 'e64bb1dd9ed68281af9968cf2cd23b4e49ead76c': Fix issue #1924851