Partial resolution of OB1 problem.
Removal of Package navigation for generation.
Merge remote-tracking branch 'refs/remotes/origin/master'