Merge "Remove deprecated skip decorators"