func_alias changes were not merged back to 0.15