sync with adapt learning develop branch