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