Port of features to clean (MC2 update) L900 Source