5 Years Ago
merge from flare_optimisations