Merge branch 'v2.0' into v2.0-imageresize-onerror