Update code between branch havana and havana-R1.05

The commit merge b1d40035a4f4b0e67c49921cd884c52e258662fe broke some functionality.