Update shani

@T4451:R this is resolved, code is commited