Merging master changes into 165-rolling-grid