[PATCH 16/20] sap: add post_sim handling