Merge "Fixed the historic messaging experience" into pi-dev