Fix code syntax (lint warnings).
Wrap template handle in method as template module.
Merge branch 'master' into ePages6