Merge "Initial code drop of version 0.153"