Merge "Support more than 8 firewall chains / match types." into tm-dev