FIXES for master-en