Merge branch 'hotfix/signal'
Merge branch 'release/1.1.2'
lolfix
Merge branch 'hotfix/sig' into develop