Merge "Change RETURN_VOID_BARRIER to RETURN_VOID_NO_BARRIER"