Merge "Bag o' QC UX improvements"