Merge branch 'rt6i_gateway'