Merge master
into shilman/refactor-core
#2628
Merged
master
into shilman/refactor-core
#2628