Merge branch '19188' of github.com:tschw/hifi into 19188