Merge remote-tracking branch 'origin/ability-changes'