Merge branch 'vishdha-non_profit2' into develop