Changes for [INFO-183]

@jbirdjavi