changes due to today's analysis
Merge remote-tracking branch 'origin/master'