Merge "BUG-2865 Partial fix"