[#54316310] More template stuff...