Mostly complete implementation of MDL-7315 Activity Extensions