Merge branch 'release/1.0.5' into production
Merge tag 'v1.0.5'

1.0.5