ticket/312635

This branch is not deployed at the moment.