Push part of 34106 (some of this is already done):
http://bbimagehandler.codeplex.com/SourceControl/changeset/34106