Updated to reflect latest changes in CH builds (2678+)