Merge "Add set(), get() for variables that need lock" into main