UF-56: additional improvements (mostly changes are related to WARN messages)