#10116: Universal-Analytics-Adapter and bugfix