CFY-974 changes to should eventually appear in master as well