Commit before move to Intellij and JSE 1.8.