Merge remote-tracking branch 'refs/remotes/drebs/feature/5191_add-soledad-invalid...