Merge "bug fixing uCPE"