NWUKFS-300 - (GEN.3) Address US states Revert last commit.