[MERGE] OPW 578249: base: function field of new_password should return dict, not...