Revert "Revert "Merge pull request #2642 from theanh0512/MAGN4944""

This reverts commit 847dea25f7f871bf0a149dc3be6d165533a1937e.