Updated changes for R16.