Squashed 'src/module_gtf/' changes from aff16c61..3a21f2dc

3a21f2dc Merge branch 'next_version' into next_app_gtf
3976c6b6 Revert "a revert "
2325830c a revert
2ca9b728 next_app_gtf into next_version

git-subtree-dir: src/module_gtf
git-subtree-split: 3a21f2dc