merge of '44c54209ef42574b28e953dcdf33228f818c8da7'