Merging REI Repo - Part of release 1.16