Merge branch 'Johnnatan-Branch' into LiranBranch