Merge from shakaran