PROBCORE-248 Fixed Null Pointer Exception in UI Code
Merge remote-tracking branch 'origin/develop' into develop