Fixes for import errors, along with merge conflicts
Merge dev-set3-iteration5