Fixes #6232
Testing #6152 ON DEV ONLY