#gts-21 In Progress work 1h5m Production items changed, some fixes.
Merge remote-tracking branch 'origin/master'