Bastion: System Bulk Actions: PR 2904 address comments