Vik, are you going to implement this and other snippets of code that are correcting bugs in 4.2.0?

//Morgan