[MERGE] javelin to master

[Kelven Yang]

Please hold on check-ins to master, I'm now testing the final merge from
Javelin and will push the merge soon, I'll notify when it's done.

Kelven