Merge branch 'lp/config-vername-check' into next