ENCANTO-487 #resolve