Few small changes.
Merge framework/master