For eventual implementation in CAS fork