Merged trunk to fixing-logpro-test_data