Add a feature to implement #930