assert nonnull soledad
Merge remote-tracking branch 'kali/bug/assert_nonnull_soledad' into develop