sgs4a code merge