Merge branch 'fixes-before-m4' into 'development'

create confidential client, add checking airplane availability and some more small fixes

See merge request !26