Merge US2410: move rhc-chk into rhc setup

With minor review fix at the end. [merge]!