Retrospective commit of v5.0