Merge "Hashmark support in 3gpp objects"