! Merge latest dev branch changes to refactor branch. Remove temporary attribute loader, for later refactor by another developer