BG Source code merge changes