Merge "Add Constraint_BP aconfig flag" into main