feature 1254 heyheya-amutaqa