FL-12306 was an issue related to git not merging, but it has been a while since we have reviewed this template for other necessary maintenance. This issue is about doing that – reviewing changes since the last work on the template to see if there are other updates such as new USE flags, features, configure options, etc. that are not yet enabled.