Merge "ANT+: Enable ANT+ project"