Re-merging #164 and #166