I was baffled around an another issue due to the diff, please ignore my previous comment. Merging now.