Merge "Test flags before using "info"" into jb-mr1-dev