ticket/307181

This branch is not deployed at the moment.