Merge "Add frontend container"