Merge "Fix positional formatting and add skip check"