Merge branch 'ab/cond-skip-tests' into maint