Merge from main GridPACK repository