disabled ios grace delay, simplified bootstrap
Merge pull request #2987 from sebv/grace-delay

Disabled ios grace delay, simplified bootstrap
duplicate field fix
Merge pull request #2988 from sebv/duplicate-field

Duplicate field fix