Merge from AF-Windows & APL project.