Merge "SOTN issue fixes"