Merge branch '28.541_Rel20_CR1603_Rel-20_CR_Correction_to_X2HOBlockList_YAML'...

Merge branch '28.541_Rel20_CR1603_Rel-20_CR_Correction_to_X2HOBlockList_YAML' into 'Integration_Rel20_SA5_163_YAML'

28.541_Rel20_CR1603_Rel-20_CR_Correction_to_X2HOBlockList_YAML

See merge request !1927