Merge "More improvements in the change info block UI" into stable-2.9