Merge commit 'smcv/updated'