Merging #337