Revert: Merge branch 'b-5.0'