Added definition for activation record
Resolved conflict
Merge branch 'patrick-mt'
Conflict Resolution
: