I assume this needs backporting to vmg/clar? :)