Merge "Fix issue with rendering 'identity' key in GUI" into casablanca