fixed #681
Merge remote branch 'mcm_origin/master' into limited_reserve