work in progress BOS1405148 before branch (forgotten)
added activity processing
fix activity part of BOS1405148