Combined PR (#515)