Merge "Revert "BUG 410 -- update to new platform""