Merge branch 'abartlet-4-0-local' into v4-0-test