Closes edulify/play-hikaricp.edulify.com#2