Roundup of changes fro D.o patch