Merge with manis changes