finalize act-1589
merged