Pull request of open-ideas/IDEAS/Annex60 to rubenbaetens/IDEAS/master

Pull request of open-ideas/IDEAS branch < Annex60 > to rubenbaetens/IDEAS branch < master >.