PROBCORE-382 Playing around with x axis
Merge remote-tracking branch 'origin/develop' into develop