Merge commit 'bct/headless-tests' into experimental