DEPL-6150

Fixed DEPL-6150 and updated dependencies. See mail for more details.