[jopr-dev] DEV_AS_5_TMP branch merged back to trunk