Bug1011601

WIP - pending platform fixes for further testing.