#991 Merged changes to import branch