Implemented workaround for rdar://14684188
Merge branch 'od/issue_496' into develop