Added context locked regions
Merge branch 'development' of github.com:aakb/odaa_dk into development