Sweeping !363 from Rel-v30r0 to master.[v30r0] update base

Ghost Userrequested to merge
cherry-pick-2-4ca5b98c-master into master

[v30r0] update base

See merge request !363 (merged)

Includes also !365 (merged)

Edited by Andre Sailer

Merge request reports