#3073: made a copy of the reintegration branch to keep splitting code (which will be removed for reintegration)