Merge changes from topic 'northbound-refactor'