Merge with Shirit #2