ticket/315969

This branch is not deployed at the moment.