bugs fixed
Merge remote-tracking branch 'origin/AUK' into AUK