Merge commit 'origin/bug_345_configurable_recordingnames'