performance changes implementation
Merge branch '2.3.0' of https://github.com/photon-infotech/framework into 2.3.0