Merge branches 'dev' and 'stmtasync' into dev