Sync with upstream development
Merge remote-tracking branch 'origin/1.5-develop' into 1.5-develop