ticket/316517

This branch is not deployed at the moment.