protect action objects against unnecessary sorting
Merge remote-tracking branch 'origin/master'