This includes for example a more target-centric approach and formatting issues while at it
mentioned in merge request !3744 (merged)