FL-318: Temporarily fork genlop