Initial commit from severalnines
Resolve initial merge conflict