Merge branch 'bug_236_recordpath'