Sync with LWF
Merge branch 'master' into lua