AP - Merge Branch Conflict 18.3PROD to 19.1Dev

Issue No: AP-7447
Created 6/24/2019 6:44:56 AM
Type Bug-QC
Priority Blocker
Status Closed
Resolution Fixed
Fixed Version 19.1
Description Please fix the conflict on Merging Branch Conflict. 18.3PROD to 19.1Dev   !pastedImage_d120768_0.png|height=520,width=706!   !pastedImage_d120768_1.png|height=239,width=639!