Merged updates from trunk, package updates and instruction changes.