Merge 8.1-ohiggins changes #80477
Merge branch '80477_merge_8.1-ohiggins' into 80477_load_ipt_minen
Load Channel fixes #80477