turned off the boost function
Merge branch 'master' into release