Properly close Soledad at quit
Merge remote-tracking branch 'chiiph/bug/4504_properly_close_soledad' into develop