Merge branch 'special-variables' into development