#91605 #103536 ## Current implementation   ## Desired implementation  