Dev1 reintegrate

Reintegrating dev1 branch back to master