Merge branch 'jh/pre-push-sample-no-custom-ifs'