Addressed all last comments in patchset 20