Merge "Fix NPE while creating autonomous GO" into jb-dev