Task 11184 - bugfixes. Ready for work