Reintegrate branch citrus into master