merges + fixes + changes

4.2.2 merges + geeb fixes + geeb changes