GBL merge

As discussed in the meetings!