5 3 stable

merging changes from 5.3, origin repository