Merge branch 'update21' into live