2736f4491a
Fixes #5725 (cherry picked from commit 3a2dc46ff0b42d42f93b0dd7267d526e7bb8b30a)
Fixes #5725 (cherry picked from commit 3a2dc46ff0b42d42f93b0dd7267d526e7bb8b30a)