Merge branch 'fix/add-default-fluxcache-properties' into 'master' See merge request !2157
mentioned in commit 1ab3ac40