merging fdewaghe-featureBranch1 to stable