added -> db_connection
changed -> salts
Merge origin/2.7 into 2.7