2 Commits (improve-data-variable-resolver)