Merge of latest changes from original project