Manually merged changes from 'lykoss:master'