Add description of changes to merge branch fix/508.