Merge "BUG-4117: add support of Old Notif. for Statistics"