Merge "Support OC4.1 deployment"