Required * and formatting tweaks.
Merge branch 'constraints'