Combined PR (#546)