[Core, Locking]: Different fixes and enhancements