Issue #3092408 by ravi.shankar, govind.maloo, Chi, alexpott: Fix broken references in Field UI module (cherry picked from commit 8ac2be21)