feat/MGS-5794/garan-css-21x into 21.x

See merge request m2c/theme-creativeshop!3179