Merge "SF: Optionally skip slow unittests"