resolved issue 1 QA feedback

Administrator requested to merge issue_1_issue_while_combining_token into stagging Sep 23, 2022