Pulling fixes from SB4 integration back into the origin project