Thank you @edyuenyw for fixing, confirmed it is working on Version: 10.1.4
Patch #25 is working for us on core 10.1.4