Retrospective commit of v5.0
Commit of v5.1