Small import changes develop

Same as #849 now onto ```origin/develop```