Add updates for 2.6.3
test