Merge "Apex user manual: Frankfurt changes"