Combined PR (#570)