12.0.17 custom fixes