Prepare for EAP 6.4

Do not merge yet, this is a work in progress.