Upgrade form 17 to 18

Closed as duplicate of: