Include hotfix made to master and missing from develop