Make ready for main branch merge. Revert to online communication version