BABBLEIOS-31 #resolve