based on common 4.1.0-snapshot