Cqr forked master update