V1.5.22.1

@andreeamatei can you please have a look at this PR?