Reverting to CM base to merge Para's branc