Merge "LaaS Base functionality"