Fixed ambiguous caller
Removed unused import
Merge remote branch 'origin/master' into DAWNSCI-809