Merged with 372-1393 (minus SDK 5.110-specific bits)