Merge "Persist Standby Buckets after System defaults set"