Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maint