added type matcher, following c5337bb5c2625977e84215651acef61c6fde9ca5 and 4f2bd31d0efa9d99cdc5d26cb1fbf9831fec3a49;
added type matcher, following c5337bb5c2625977e84215651acef61c6fde9ca5 and 4f2bd31d0efa9d99cdc5d26cb1fbf9831fec3a49;

NaaS/motto,NaaS/motto