[AAA] Merge master branch into develop branch