Merge "Fix HUN touchable area" into main