[12567] Update [12561] to a safer code version and also add GO caster scenarios Thanks @rsa and @Schmoozerd for providing the feedback