TISTUD-4336 New Classic Project: intermittent freeze when classic templates load