Combined PR (#532)