2.0-SNAPSHOT implementations
Merge remote-tracking branch 'origin/master'