Alining with Master and adding two missing files in Common