Combined PR (#562)