merge zaf's recent changes with main dev branch