Merge latest Changes from orangemocha

Merge latest Changes from orangemocha