Merge "modify dace polling and loopControlName"