AW-1804 AW-1764 AW-1772 AW-1806 #comment improve dialogues