FQA-1069: ECMS/BasicAction/Sort and Revert