NEXUS-6323: Merging master changes

re crypto plugin