Re-organize and condense changelog before merging feature_public_trial branch.