Merge "sthal: fix deadlock issue during ssr"