26402 & 26797 updated

Done.