Latest changes from Yoast

Latest changes from Yoast