18 Commits (fix-3244-v1)