acu159261 add info about #15537 fix
acu160049 - resolve conflicts