Cherry picked production fixes.
Cherry picked production fixes.

jeking3/web-interface,jeking3/web-interface,jeking3/web-interface,sahara-labs/web-interface,sahara-labs/web-interface,jeking3/web-interface,sahara-labs/web-interface