Fixed #21174 -- Added tx control to some related manager methods