bug fixes in knitkit
Merge remote-tracking branch 'origin/bootstrap' into product_catalog