Zerty 1.2.1.4 Merge

Base markers still do not work when base protection is disabled.