Merge changes of repository atkphpframework/ATK_7_1_DEV

Changes of [@wayneh](https://github.com/wayneh) merged using ```git cherry-pick```