Oslo Merge

Merge in print operator fixes from Oslo

Change-Id: Iff6af9298cfa571b70729ea242a3b9dfc111a890