Merging back changes from ch/open & Preparation for SBB Dev Day