APD-715: more changes in i-box
Merge branch 'APD-715-BOZ' into develop