Rearranged the bundle file.
Merge branch 'master' into staging