Dev reset from master

Dev reset from master