[xwiki-devs] |VOTE] Merge improved CM in master