Merged current ronnix/master