refresh fixes
Merge remote-tracking branch 'upstream/dev' into dev
few changes tp grid and updated number of operators so correct