Raees/combined changes

@jzoldak