Implements feature-7652