DO NOT MERGE  Nobug final beta support

Testing branch for supporting "final betas"