improving condition
Merge remote-tracking branch 'origin/master-ltc' into master-stc