Raven db 2363 final

PR