Fixed #23338 -- Added tests and updated documentation