Merge pull request #4068 from MervinPraison/feat/unified-run-on