Merging riwh updates to dev version