Merge "BUG-2836 Workaround"