Revert "Revert "fixes hmagph/ui-toolchain-demo-1455545663099#1""
Revert "Revert "fixes hmagph/ui-toolchain-demo-1455545663099#1""

This reverts commit 337e82971bd1d90e88671f1f423fce5b15b5948f.

hmagph/catalog-api-toolchain-demo-1455545663099,hmagph/catalog-api-toolchain-demo-1455545663099