Merge "Fix null pointer dereferencing in TWGBP" into oc-mr1-dev