Combined PR (#557)