Finished AP-1.
Merge branch 'Java'