Change list so it works correctly
Merge branch 'release/3.0' into develop