Merge branch 'refs/heads/require' into dev2
Merge branch 'refs/heads/gif' into dev2
Revert the version for dev