[#80511082] - Make demo app work with foundation
[#80511082] - Make demo app work with foundation