Merging #339