premerge kirby adjustments
merge conflicts fixed