Merge "Fix static_assert compile issue"