Additional fix to merged stable branch changes.