Latest changes

* 2c35ed80680ddc04fd476304a91228c75693ee2a
* c994cc24c37a9e02fb09ba6d867d7a5c6fbef9ae