QA execution and changed based on the suggestion from DBA.