Changed to add Common Options when constraints are written

Can this be applied to the 8.7.x branch too?