Merge "Renaming "mbskip" to "skip"."