Bundling all changes done on the plane

@qinweigong