Merge "BUG-731: fix unused imports"