Merge remote-tracking branch 'remotes/origin/dev' into Issue/1951-quotaImplementation

# Conflicts:
#	src/ResourceTypes.Tests/RdsS3WormResourceTypeTests.cs
3 jobs for Issue/1951-quotaImplementation in 3 minutes and 2 seconds (queued for 3 seconds)
latest