Merge pull request #11703 from rohitwaghchaure/pos_bind_event_issue

Code cleanup