Merge "Fix reclass for designate single service setup"