Merge "Unhide FrontendSettings part 1 with super Builder class"