Merge branch 'release/YjgxNT'
Merge tag '1.0.5' into develop

Added cookie settings