Merge remote-tracking branch 'C2Devel/pull-request-snapshots' into pull-request-snapshots
Tests for #1554, remove unneeded compatibility layer