[SR-Dev] git:master: refine 15e2e89e5d1e7f9dc6265c270153088596159ee5, remove instead comment out