AW-1806 AW-1804 AW-1050 #comment add dialogue comment fields