integrate-fixes-#135 #146

Closed wduda closed 8 months ago