Merge "Remove a duplicated skipped functions"