Merge "[RESTRICT AUTOMERGE] SF: Call clear() instead of empty()" into main