|#000| Anshul | Reverting all the merged changes from master to vrmis branch