Merge remote-tracking branch 'origin/arics_update' into arics_update

# Conflicts:
#	.gradle/7.5/executionHistory/executionHistory.lock
#	.gradle/7.5/fileHashes/fileHashes.bin
#	.gradle/7.5/fileHashes/fileHashes.lock
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	.idea/workspace.xml