Merge "Complete FrontendSettings"