Merge "Fix IDEA warnings in CloneDatabase"