Support HR 1072

Support HR 1072