Merge "Reverts ag/1803954 and ag/1828349 and left only split custom action"