[CLC-1244] Act-as feature fixes