FLUID-5469: Added normalize and foundation