This issues is to break down #349. It is the next step after #357.
This issues is to break down #349. It is the next step after #357.