Merge functional howto improvements with 3.3.