Update trainee maintainership issue with pajamas reviews/changes - submit for maintainership

Trainee issue: #6934 (closed)