Merge branch 'release/v0.13.0' into develop
comment out unnecesary function until further notice
Merge branch 'release/v0.13.1'