Feature/beta 10 rt fail