FL-301: fork scrub, apply clang fix