The commit to cherry-pick: https://github.com/richfaces/jdf-quickstarts/commit/9884c9ea226950b9e0ad1724e5ac5bc1e17e65d9