Merge of current ronnix/master