ticket/309479

This branch is not deployed at the moment.