Changes for bug#3648050