Merge "Refactor LOCAL_INIT_RC"