Merge commit 'local_master/myplc-0_4-branch' into myplc-0_4-branch