Comply with hpp-kwsplus v2.3.