DM-1463 Use shiftMax configuration item
Merge branch 'master' into u/pgee/DM-1463
Merge remote-tracking branch 'origin/u/pgee/DM-1468' into u/pgee/DM-1463
Merge branch 'master' into u/pgee/DM-1463
Merge branch 'u/pgee/DM-1463'