Merge from IdeaBlade:master