Merged in next_804_merge (pull request #287)
Conflicts in gs2_layouts.fpp and .gitlab-ci.yml resolved
Conflicts in gs2_layouts.fpp and .gitlab-ci.yml resolved