Merge branch 'update_syntax' into next