Refs https://redmine.teklia.com/issues/6788
Related note: https://notes.teklia.com/3AZM9ZgIRE299999mSsAjg