Readded changes from current week lost in mega merge.