Modified for https://acsmine.tok.access-company.com/redmine/issues/11815