Returning from inside the guard
Merge branch 'mbst-8258-rovi-deltas' into stage