merge request 3rd wave