Eclipse 946 p3 feature bugfix

This is a marker PR for now, but this PR includes the critical last commit for feature inclusion / build system / etc, as well as small bug fixes.