7.x branch (neticrm 2.0)