Merge branches 'topic/pie-other-and-missing' and 'topic/derivequeries' into philip-stable