fix duplicate execution issue onprem#9

frikky merged 3 commits intoShuffle:mainShuffle/app_sdk:mainfrom

yashsinghcodes:mainyashsinghcodes/app_sdk:mainCopy head branch name to clipboard