Updated for 11.5.0 and up to hotfix 11.5.4