Merge back from develop

Wait what about 2 and 4?