Merge "Merge stage branch to development trunk."