Review comments has been taken care for #311.
Review comments has been taken care for #311.

RLOpenCatalyst/core,RLOpenCatalyst/core,Durgesh1988/core,Durgesh1988/core,RLOpenCatalyst/core,Durgesh1988/core