partial modify for CORE-2897