Re-base from current code

Rebase