Updated scripts and restored rtm lock fallback mechanism