Combined PR (#545)