branch commit test merge from niels

please merge