turn off -O for debug env builds
Merge branch 'upsert19'