Wbiesing/merge recent

@Elmira88  These merge in all the recent PR's AFAICT