Add changes to mono

Merge proj related changes from Jun to mono