Merge "add more PollingCheck" into jb-dev