Merge "Fix document management permission enforcement." into klp-dev