Merge "Fix container authorization - front end"