Develop pull request from meng

Hot fox for RC5