Commit before CPL's merge

need to perform this before I merge my latest changes