Merge "Fix create container method"