Merge "Added API flags into the control-wrapper files." into devel/master