Merged in changes from private branch