Merge attempt

[keyvan-m-sadeghi]

@keithluchtel @ghorbani-m

This is an untested attempt with:

git remote add monorepo [email protected]:functionland/apps-monorepo.git
git pull monorepo main --allow-unrelated-histories