Fix for market close refresh logic
Merge remote-tracking branch 'wip2/master'