Merge branch 'features/1769_headless-mode-test' into develop