Master

includes fixes post 12/5 code review