Edge case-handling and support to capture feedback UA added.