[RELOAD-157] Missing fixes for merge conflict.