update CC49 with master changes