Yesterday
merge from main/horse2_fixes/handling