mmn96: implement some change for votor#397

hieudinhngoc-ncc wants to merge 1 commit intommn96/handle-fork-generationmezonai/mmn:mmn96/handle-fork-generationfrom

mmn96/handle-fork-generation-2mezonai/mmn:mmn96/handle-fork-generation-2Copy head branch name to clipboard