#bc-17 work 15m
small fixes
Merge remote-tracking branch 'origin/master'