Merged from local

Merged changes manually