merge fixes

2 jobs for v0.2.2 in 11 seconds (queued for 1 second)
latest