a48e5c7347
Motivation: a48e5c7347 from 4.1 introduced a build failure when merged to master. Modifications: - Resolve build failures due to interface changes. Result: Build now compiles.