Compatibility improvements with merged MES version