Merge branch 'hotfix/0.6.2'
fix delay enroll validation
Merge branch 'hotfix/0.6.3' into develop