Merge "Update parts order in message files"