Merge branch 'hotfix/bpfg-295' into develop
quick fix for bpfd-295
Quick fix for bpfd-295 to deal with group in the url as well Merge branch 'develop'