BCS 746-000857 (cherry picked from commit 4bf6746d)
mentioned in commit seco-ne/yocto/manifest@80956eee