Merge some enhencements from cms