Merge "[Setting] Code cleanup"