Branch 'flex-guest' - 2 commits - java/code