Merge tag 'wlcore-fix' into fixes