US611: Merge 'develoment' into 'integration'