Merge pull request #1123 from andrzej-jankowski/develop

[Core] Services view - changes