Resurrected

Resurrected Bugs from Bk 1735833600000