Merge "Complete FrontendSettings part 1"