Partial merge of develop to experimental

Commit

7 years ago

Partial merge of develop to experimental Does not include #2336 as the file has been moved out from underneath it: will do this separately