Merge "Add SpaLib for Settings"