Merge "Sync-up with latest release source code." into develop