Merge "Revert "ResourceHandle : Refactor resourceHandle data type to long"" into main