Previously Jiahong's first change broke the build. My change forked before Jiahong's fixes for the break. Let's discuss together how we solve this problem.