[kolla] URGENT to cores - DO NOT MERGE patches