Import persistence-setup.git's feature/14594-asp-gui branch at commit a818c6ea88eb9747bb467306e95ae68dcfbede34.