Feature/adwd 1031