Resolved conflicts with Abhilasha's pull request.