Incorporating comments from code review
Adding some additional logging
Merging dev/SE-207 to the correct branch :-)