Merge commits of 'feature_elf'

Include current improvements in 'feature-elf' branch to 'master'.