NXCALS-689 changes to fix mac problem

@msobiesz - please verify

Merge request reports

Loading