Merge "Remove old compat methods/functions for mb_ functions"