Corral/thbk 775 mainteinance#6

doctorcorral wants to merge 4 commits into

mainvaliot/relix:mainfrom

corral/THBK-775-mainteinancevaliot/relix:corral/THBK-775-mainteinanceCopy head branch name to clipboard