Ime/bug1010021 stability check