Initial implementation for ENYO-1219 - For reference only, DO NOT MERGE