#3357: added marina history