Issue #535616 by jhodgdon, rootwork, ianthomas_uk, pwolanin, oriol_e9g | tgeller...