Rebased headless_test branch with cbmi/master