Critical limit lowered from 600mb to 500mb
Merge branch 'hotfix/1.0.0'