#455, Improved also with WMTS support.