Aligned with master (except poms/OSGI)