Merge remote-tracking branch 'origin/beta2'