Merge remote-tracking branch 'origin/develop' into develop
arity hack to allow literals to not be registered