merge changes for main into turn off/on single antenna branch