Merge branch 'master' into dev
modal for UI confirmations
service timeframes
gh actions
makefile updates