Merge commit 'smcv/master'