Pulled experimental / unfinished features into experimental branch. Prep
for merge into 7.3 release build.