Address comments for RAVEN circular; Fixes #55 #56


(cherry picked from commit 0fb2faec)
10 jobs for cherry-pick-0fb2faec in 738 minutes and 20 seconds (queued for 1 second)
latest