[Vhanibal] Update nov 14 (reverse-merged from commit 2b47c6a67d3c70beac4bb38411a99fea43929ac0)