UAT-7810 continues building OR... Note