2.4 code merge