Merge remote branch 'tags/2.3.4'