Update MASTER branch to latest version showed at 24th May (Not from merge: Original commits are in the DEV branch