Merge from master with new Log System