Merge "Fix 6283709: set max FUL failed attempts to 5" into jb-dev