#64 Merged from dev into branch 64-browsing-app-specific-objects