Merge remote-tracking branch 'refs/remotes/ivan/bug/remove-unused-import' into develop