fix(perf): Performance and locking improvements (closes #4881)(closes #4504)