Adds following commits

- 777ebf2dbeb701f086b57e37f976ee4385a51887
- 40c3c8e40dc0fc9293f81cb503b28ad153222c92