Merge "Replace broken --wait flag with --wait-for-staged-ready flag"