Merging the bouncy castle change