Task #1369 - sync better with s4m