Merge "issue27 a60air" into "issue34_BESTEST"