feature 660 heruka