961607673d
add a helper to replace the value only if it is absent or default rearrange some functions
add a helper to replace the value only if it is absent or default rearrange some functions