trying to merge TourDeFlex develop release into master