Merge "Add a flag to allow extending the check post dim"