Merge branch 'iprops'
Small refactoring.