Merge "SF: small fix to 3f96592d3b985b258f488f5497dc02a7dc2eb5a8"