Added condstrore to yes
Revert "Added condstrore to yes"

This reverts commit d486ecfbfb084c26eaa0911df1f2d223263785e2.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fix flag for compilation
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix possible smtp crash
merge