Fixed #80958, readded changes from current week lost in mega merge and refixed #80948