JAL-1670 repositioned feature for backwards compatibility of feature