changes for CB-1461