[RFR] #3411 new contentselector component created

Remove commented code