ICMS-524
ICMS-524 merging