Merge remote-tracking branch 'origin/release/2.5.6' into feature/cloud