sync with internal version
add SuSE support