Merge "More work on SHORT_SERVICE FGS"