Merge "res/res_stasis: Fixed wrong StasisEnd timestamp"