be more tolerant in initialization routine
Merge branch 'master' into _remote_complete