Re-base from current code

Re-base from current code