Recommendations

based on SDDE-578