This is leftover for other RFC change that I postponed. Thanks