fixed scheduling race condition SW-826
This tag has no release notes.