20 Dec 2018 Providing the updated patch with inter diff. Please review. Gaurav Agrawal Code contributions