Merge "BUG-1407 fix."