Merge dev branch to master (version 1.6.0.2)