Merge "SF: More frontend fixes"