Merge Dev bits

Merge dev bits