Framework/Recorder added to solution. Framework and Tracking upgraded.
Merge remote-tracking branch 'origin/dev' into dev