Merge changes from topic 'var-overrides'