Feature/bug 707685