Collated according to the issue tracker

Collated according to the issue tracker