Update for 2.11-RC1 / 2.10.4

Issue: SNX-2