Merge "Use macro for filter extension length" into experimental