[MR,AP] {bugfix} merge with master complete
Merge branch 'ContextDelete' of https://github.com/DusanTrkulja/sw14_xp_02