Merging in changes from cegeka/master