See #7011, solves both issues.