Merge branch 'lpm-v6.10/constraints-tweaks' into lpm-v6.10/constraints-integ