Updated doc for [ Feature Request #5735 ]