Implemented all the changes suggested by @SL-Gundam
Added configuration item to control using this feature (#16719)
Updated changelog