Added a few more issues in the list because 6.0.0 had more than a 100
Merge commit 'e34215cd96aef39e22f3d2633be6576af4dd4e3f'