04a9b834e4
Motiviation: Commit f45d754 from 4.1 was directly merged but interfaces were not updated. Modifications: - Fix areas where interfaces have changed between 4.1 and master Result: No more compile error.