Merge "Add modifier goal incrementaljavac"