merged feature/flights-customization branch