Merge "reduce delay even further: 1 to 1.5 sec as failure still happened" into jb-dev