Merge remote-tracking branch 'origin/beta' into lucky_rulers