* Fix extended loop_control with includes
* Use assert for testing extended loop_control
* fix typo
(cherry picked from commit a213b9160c)
* Fix extended loop_control with includes
* Use assert for testing extended loop_control
* fix typo
(cherry picked from commit a213b9160c)