Revert "Merge branch 'master' into Sajjad"
Revert "Merge branch 'master' into Sajjad"

This reverts commit dab34fa7c7dab599550d0c3bbba42cf2d04ca3d0, reversing
changes made to b90f5e4832380a2cd0e4622ea106783f48da1423.

sajjadtaghilou/star,sajjadtaghilou/star