backported changes from museum project