Merge develop to js.pattern.proxy