Merge changes from Au Lab for IDP 0.1.7