merge some modifications into a new composite#987

Mathieu-Deharbe merged 18 commits into

maingridsuite/study-server:mainfrom

merge-modifications-into-compositegridsuite/study-server:merge-modifications-into-compositeCopy head branch name to clipboard