Merge branch ‘client_folder’ into new-theme-aws

You already voted!

Merge branch ‘client_folder’ into new-theme-aws