[BUG #8471] Fixed deps analysis