[PATCH conductor] Redmine3153 partials cleanup and fixes part1