2 update global processing

As our current development is somehow diverging, we need to merge the latest branch into the main branch again.