Merge 1897

This should be exactly like 1897, but now mergiable. There seems to be white space issues which are creating troubles.