Merge branch 'feature/variableBindings' into develop #18