2093: Make we don't both prepend and append
Merge branch 'production' into i-2093
Merge branch 'i-2093' into production