Better Change generation for merge
Merge commit '4967a3ba3a557065bff42aad71a47bad91bc0cc7'