fix CTX segfault
Merge branch 'development/stage' of https://github.com/Bartlby/bartlby-core into development/stage