Merge of several local bug fixes

Merge of several local bug fixes