Merge branch 'release/1'
Deadline for rejecting
Merge branch 'hotfix/1.1' into develop