Merge "Change wait parameter for ping command"