Generator merge to proper version#6

YotamGolan wants to merge 3 commits into

uccross:masteruccross/cavsat:masterfrom

YotamGolan:masterYotamGolan/cavsat:masterCopy head branch name to clipboard