T569 T570 Refactor & improvement for new feature in iceScrum pro