Rearranged before working on this feature
Rearranged before working on this feature

related to #1523

springfox/springfox,springfox/springfox,yelhouti/springfox,springfox/springfox,springfox/springfox,yelhouti/springfox,yelhouti/springfox