Merge branch 'feature/closure' into develop