Merge remote-tracking branch 'alfh/feature_updxlrator' into next