Compatch: common folder (2.2.1)