Merge branch 'develop' into epic/gif4