Merge API settings branch into develop