POS-1212: Changes for simple feature.