Current dev branch

Review only at this point.

@hkrishna