Merge branch '3752_extfs_tester_export_more_variables'