LOADUI-821 Applied changes discussed in Code Review