Trouble integrating with core-communication-lib:context-switching branch