[comcarcoff] Adapt c62159ea91a04ef82560472b254aef1cc9f70a11