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

This reverts commit b8b0ecc62183f64102c7b363b6ed18ea681fd460.

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