master default pkaminski-patch-1