Merge "Doc security after implementation update"