based on a discussion wrt merging fixes into the 1.0 branch, i would like to suggest that we merge both fixes OAK-2015 and OAK-2255 into the branch.
+1It would be helpful for people who weren't involved with the details to add a bit of context like, why you think it is important and safe to back port.
Michael
