Issue ITTE-458

The solutions to the last three tasks of the issue.