Branch 'flex-guest' - java/code