[#44078709] Fixes to features