#21126 - Updated to work with the latest version of core v0.14.23