Revert "Revert "Snapshot 5.3""

This reverts commit bbd7b0071910cd1ff4995610773e302835481ea8.