These changes in lazy interfaces are already committed, merge with master so as we dont have any problem when merging this with github tool.