modify files 27-40,718-721
Merge remote-tracking branch 'origin/poetryapps_development' into poetryapps_development