Merge tag 'v0.4.15'