F21updates

merge F21 devel branch; F19 still supported through (code) branch