compatch for 2.2.1.3 -- common folder