Merge remote-tracking branch 'Polarsys/neon' into 562302-Implement-unit-tests-for-existing-features