Merge "Revert "Fix M Issue on configurable policy engine version.""