Merge "Companion constants for QP bounding" into sc-dev