This series of patches closes the support gap on one of the explicitly