Combined PR (#555)