Fixes prior to merge with Master
merging from Knowledgebase
fixing merge bug