Adding delayed signing
Merge branch 'master' into dev