Add / improve support for conect, security and mobile Micro-P subbrands