Is now synced with the trunk as I upmerged the trunk into this branch
current trunk as basis for refactoring of debuglogging