issue #2103 modify control api name and some inlude set